bitkeeper revision 1.1159.139.1 (41812b181BAMhNMp1vcdcr5-TskWOA)

Update to Linux 2.6.9.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S
index 829f1c91d813a0bd04149e78b3c72578a27cf360..e0512cc8bea76b9b73c75177426209b0b6306095 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/vmlinux.lds.S
@@ -4,6 +4,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
@@ -11,12 +12,13 @@ ENTRY(startup_32)
 jiffies = jiffies_64;
 SECTIONS
 {
-  . = 0xC0000000 + 0x100000;
+  . = __PAGE_OFFSET + 0x100000;
   /* read-only */
   _text = .;                   /* Text and read-only data */
   .text : {
        *(.text)
        SCHED_TEXT
+       LOCK_TEXT
        *(.fixup)
        *(.gnu.warning)
        } = 0x9090
@@ -66,9 +68,6 @@ SECTIONS
   __setup_start = .;
   .init.setup : { *(.init.setup) }
   __setup_end = .;
-  __start___param = .;
-  __param : { *(__param) }
-  __stop___param = .;
   __initcall_start = .;
   .initcall.init : {
        *(.initcall1.init)